check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches #303211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ding differences found
Closed
13 tasks
LeSuisse
approved these changes
Apr 10, 2024
1 task
|
Successfully created backport PR for |
|
Git push to origin failed for release-23.11 with exitcode 1 |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-23.11
git worktree add -d .worktree/backport-303211-to-release-23.11 origin/release-23.11
cd .worktree/backport-303211-to-release-23.11
git switch --create backport-303211-to-release-23.11
git cherry-pick -x b612366abc32edc61e86d0fcc0f4a08cabcf5212 dc4f2184327d7b04edda404fa8562ba5e3e17755 |
1 similar comment
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-23.11
git worktree add -d .worktree/backport-303211-to-release-23.11 origin/release-23.11
cd .worktree/backport-303211-to-release-23.11
git switch --create backport-303211-to-release-23.11
git cherry-pick -x b612366abc32edc61e86d0fcc0f4a08cabcf5212 dc4f2184327d7b04edda404fa8562ba5e3e17755 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
PRs with no commits mentioning cherry-picks will produce an empty output from the git command. This behaviour will have changed when I chose a different iteration approach shortly before merging 😿
This should fix situations like #303093
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.